merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sun, 10 Sep 2006 20:52:57 +0000 (14:52 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sun, 10 Sep 2006 20:52:57 +0000 (14:52 -0600)

Trivial merge